Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorTom Rini <[email protected]>
Mon, 1 Jul 2013 14:11:56 +0000 (10:11 -0400)
committerTom Rini <[email protected]>
Mon, 1 Jul 2013 14:11:56 +0000 (10:11 -0400)

Trivial merge